From: Kenichi Handa <handa@m17n.org>
Date: Fri, 14 Jan 2011 04:08:30 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~16^2~10
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d40055dd945714ab039bc3b265aa8606bc141642;p=emacs.git

merge emacs-23
---

d40055dd945714ab039bc3b265aa8606bc141642
diff --cc lisp/ChangeLog
index 9882503e9b3,2c05bf6bb2c..15acc094fee
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,14 -1,7 +1,18 @@@
 +2011-01-14  Kenichi Handa  <handa@m17n.org>
 +
 +	* mail/rmailmm.el (rmail-mime-insert-header): Set
 +	rmail-mime-coding-system to a cons whose car is the last coding
 +	system used to decode the header.
 +	(rmail-mime-find-header-encoding): New function.
 +	(rmail-mime-insert-decoded-text): Override
 +	rmail-mime-coding-system if it is a cons.
 +	(rmail-show-mime): If only a header part was decoded, find the
 +	coding system while ignoring mm-charset-override-alist.
 +
+ 2011-01-13  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* subr.el (event-start, event-end): Doc fix (Bug#7826).
+ 
  2011-01-12  Kenichi Handa  <handa@m17n.org>
  
  	* mail/rmailmm.el (rmail-mime-next-item)